Skip to content

gh-121489: Export private _PyBytes_Join() again#122267

Merged
vstinner merged 3 commits intopython:mainfrom
cdce8p:export-pybytes-join
Jul 25, 2024
Merged

gh-121489: Export private _PyBytes_Join() again#122267
vstinner merged 3 commits intopython:mainfrom
cdce8p:export-pybytes-join

Conversation

@cdce8p
Copy link
Contributor

@cdce8p cdce8p commented Jul 25, 2024 •
edited by bedevere-app bot
Loading

Followup from #121489 and #121646 (comment). Export the _PyBytes_Join() again until the new public PyBytes_Join() is added. If backported to 3.13, this would make transitioning easier.

This partially reverts #107144.

/CC @vstinner

cdce8p and others added 2 commits July 21, 2024 17:41
@cdce8p
pythongh-121489: Export private _PyBytes_Join() again
27db060
@cdce8p @encukou
Code review
0b98ed4 
Co-authored-by: Petr Viktorin <encukou@gmail.com>
@bedevere-app bedevere-app bot mentioned this pull request Jul 25, 2024
Closed
@cdce8p
Copy link
Contributor Author

cdce8p commented Jul 25, 2024 •
edited
Loading

@encukou Seems we had a little misunderstanding here 😅 Sorry about that. Merging it into main and then backporting it to 3.13 was what I had in mind to begin with.

encukou
encukou reviewed Jul 25, 2024
View reviewed changes
Copy link
Member

@encukou encukou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO this should be backported to 3.13 as the replacement is not available there.
I'll merge tomorrow if there are no objections.

@encukou encukou added the needs backport to 3.13 bugs and security fixes label Jul 25, 2024
@cdce8p @encukou
Fix news entry
5d2f555 
Co-authored-by: Petr Viktorin <encukou@gmail.com>
vstinner
vstinner approved these changes Jul 25, 2024
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vstinner vstinner merged commit aef95eb into python:main Jul 25, 2024
@miss-islington-app
Copy link

miss-islington-app bot commented Jul 25, 2024

Thanks @cdce8p for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 25, 2024
@cdce8p @miss-islington
pythongh-121489: Export private _PyBytes_Join() again (pythonGH-122267)
15a08b0 
(cherry picked from commit aef95eb)

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Jul 25, 2024

GH-122287 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jul 25, 2024
vstinner pushed a commit that referenced this pull request Jul 25, 2024
@miss-islington @cdce8p
[3.13] gh-121489: Export private _PyBytes_Join() again (GH-122267) (#…
dd270f6 
…122287)

gh-121489: Export private _PyBytes_Join() again (GH-122267)
(cherry picked from commit aef95eb)

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
@bedevere-bot
Copy link

bedevere-bot commented Jul 25, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot iOS ARM64 Simulator 3.x has failed when building commit aef95eb.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/#builders/1380/builds/922) and take a look at the build logs.
  4. Check if the failure is related to this commit (aef95eb) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#builders/1380/builds/922

Failed tests:

  • test_socketserver

Failed subtests:

  • test_ThreadingUnixDatagramServer - test.test_socketserver.SocketServerTest.test_ThreadingUnixDatagramServer

Summary of the results of the build (if available):

==

Click to see traceback logs 
Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/test_socketserver.py", line 228, in test_ThreadingUnixDatagramServer
    self.run_server(socketserver.ThreadingUnixDatagramServer,
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    socketserver.DatagramRequestHandler,
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    self.dgram_examine)
                    ^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/support/threading_helper.py", line 66, in decorator
    return func(*args)
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/test_socketserver.py", line 133, in run_server
    testfunc(svrcls.address_family, addr)
    ~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/test_socketserver.py", line 160, in dgram_examine
    buf = data = receive(s, 100)
                 ~~~~~~~^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/test_socketserver.py", line 43, in receive
    raise RuntimeError("timed out on %r" % (sock,))
RuntimeError: timed out on <socket.socket fd=24, family=1, type=2, proto=0, laddr=./test_python_gi6ji1ee.sock>


Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/threading.py", line 1039, in _bootstrap_inner
    self.run()
    ~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/threading.py", line 990, in run
    self._target(*self._args, **self._kwargs)
    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 694, in process_request_thread
    self.handle_error(request, client_address)
    ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 692, in process_request_thread
    self.finish_request(request, client_address)
    ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 362, in finish_request
    self.RequestHandlerClass(request, client_address, self)
    ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 763, in __init__
    self.finish()
    ~~~~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 858, in finish
    self.socket.sendto(self.wfile.getvalue(), self.client_address)
    ~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ConnectionResetError: [Errno 54] Connection reset by peer
Warning -- threading_cleanup() failed to clean up threads in 1.0 seconds
Warning --   before: thread count=0, dangling=1
Warning --   after: thread count=1, dangling=3
Warning -- Dangling thread: <Thread(<class 'socketserver.ThreadingUnixDatagramServer'> serving, started daemon 6115389440)>
Warning -- Dangling thread: <Thread(Thread-2873 (process_request_thread), stopped 6132215808)>
Warning -- Dangling thread: <_MainThread(MainThread, started 4372660800)>
ERROR

@cdce8p cdce8p deleted the export-pybytes-join branch July 25, 2024 16:42
@cdce8p cdce8p mentioned this pull request Jul 25, 2024
Merged
@mhsmith
Copy link
Member

mhsmith commented Jul 26, 2024

@freakboy3742: The iOS buildbot has failed this way a few times now. It looks like it's specific to the datagram server test, rather than a random failure of networking in general.

@freakboy3742
Copy link
Contributor

freakboy3742 commented Jul 26, 2024

@mhsmith Yes - I've seen that, but it appears to be a transient problem; subsequent builds work fine. I haven't been able to reproduce locally, but it appears to be related to load - it seems to coincide with longer than usual test runtimes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@encukou encukou encukou left review comments

@vstinner vstinner vstinner approved these changes

@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@cdce8p @bedevere-bot @mhsmith @freakboy3742 @vstinner @encukou @kumaraditya303